merge
authorKeir Fraser <keir@xen.org>
Thu, 14 Jul 2011 08:33:02 +0000 (09:33 +0100)
committerKeir Fraser <keir@xen.org>
Thu, 14 Jul 2011 08:33:02 +0000 (09:33 +0100)
commitf9aa7ce1a02dc6eef2d09f6084df625763c05ceb
treeeee113913da03433814e4a03d012fb294121ec8a
parentbc91eecaa160ee5acef5f005b94b5103550a3082
parent643b106b408b081b51040fc96a6ea650059203b9
merge